dgit.raspbian.org Git - emacs.git/commit

projects / emacs.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 9b6c4e6 ef081b9)

author	Eli Zaretskii <eliz@gnu.org>
	Mon, 8 Oct 2012 13:06:31 +0000 (15:06 +0200)
committer	Eli Zaretskii <eliz@gnu.org>
	Mon, 8 Oct 2012 13:06:31 +0000 (15:06 +0200)
commit	ff520f926fa998779a316710d7c34e57402974ca
tree	ec95561b5e8e2f82b3a497e5582f652440e99c15	tree \| snapshot
parent	9b6c4e6ec4289cc49d479e171c9f5b625ecd3ff0	commit \| diff
parent	ef081b9e3d2955ac81eba76404af876debac43a9	commit \| diff

Merge from trunk after cygw32 commit, and resolve conflicts.

12 files changed:

lib-src/ChangeLog	diff1 \|	diff2 \|	blob \| history
lib-src/makefile.w32-in	diff1 \|	diff2 \|	blob \| history
lisp/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/subr.el	diff1 \|	diff2 \|	blob \| history
src/ChangeLog	diff1 \|	diff2 \|	blob \| history
src/emacs.c	diff1 \|	diff2 \|	blob \| history
src/keyboard.c	diff1 \|	diff2 \|	blob \| history
src/makefile.w32-in	diff1 \|	diff2 \|	blob \| history
src/termhooks.h	diff1 \|	diff2 \|	blob \| history
src/w32fns.c	diff1 \|	diff2 \|	blob \| history
src/w32term.c	diff1 \|	diff2 \|	blob \| history
src/w32term.h	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.